Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Fri, 15 Jan 2010 23:16:26 +0000 (07:16 +0800)
committerJason Rumney <jasonr@gnu.org>
Fri, 15 Jan 2010 23:16:26 +0000 (07:16 +0800)
commitaca9b8b8f7900976ed4b3d15adfdbb6cb93abab9
tree9e274de2f72f1c60b423a96f93f0a96d4e455dc4
parent3b1ddcc80f2e5330ee7f855aecfe5124374ec43c
parent1af94bf7f39196a96928fbe8c7a4c530c036d6ab
Merge from trunk